bitkeeper revision 1.1549 (429459dd8Wdn9xpYhxSGQBJEie8pXA)

XendDomainInfo.py, XendDomain.py:
  Disable shutdown timeout for suspend.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 7e9ebde84a8deee8522562d3b08072791b365c55..8a12311bd87d2199e66a3a03d05b0ec28661d20d 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -402,7 +402,7 @@ class XendDomain:
         if reason == 'halt':
             reason = 'poweroff'
         val = dominfo.shutdown(reason, key=key)
-        if reason != 'sysrq':
+        if not reason in ['suspend', 'sysrq']:
             self.domain_shutdowns()
         return val
 

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 8eba3a9aad098b03627fab06404b93af4e99a981..a243867ebd5bd86ff63dd85b5eabc9b401b7b191 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1136,7 +1136,7 @@ class XendDomainInfo:
         if self.channel:
             msg = messages.packMsg(msgtype, extra)
             self.channel.writeRequest(msg)
-        if reason != 'sysrq':
+        if not reason in ['suspend', 'sysrq']:
             self.shutdown_pending = {'start':time.time(), 'reason':reason,
                                      'key':key}